From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 12 Sep 2025 12:10:11 +0000 (+0200)
Subject: ci: Test toolbox build when changing build script
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~95^2^2~5
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9354fb6be43b1f9e3697064fd86037b0d1a252de;p=gnome-shell.git

ci: Test toolbox build when changing build script

The build-toolbox job only runs for main and stable branches, so
we currently only know whether modifications to the build-toolbox
script actually work once they a merged.

To catch errors up-front, do test builds of the toolbox image
when a merge request modifies the build script.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3875>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43562aaf6..89533d39f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -335,7 +335,7 @@ pages:
   stage: deploy
   needs: []
   script:
-    - .gitlab-ci/build-toolbox-image.sh $MUTTER_CI_IMAGE
+    - .gitlab-ci/build-toolbox-image.sh $MUTTER_CI_IMAGE $MUTTER_BRANCH
 
 build-toolbox:
   extends:
@@ -343,3 +343,15 @@ build-toolbox:
   rules:
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "GNOME"'
     - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/ && $CI_PROJECT_NAMESPACE == "GNOME"'
+
+test-build-toolbox:
+  extends:
+    .build-toolbox
+  variables:
+    MUTTER_BRANCH: "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
+    FORCE_REBUILD: 1
+    DRY_RUN: 1
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes:
+        - ".gitlab-ci/build-toolbox-image.sh"